From 3647a486ec05b1e01930ff299b18fc2b632e2cb0 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 26 Feb 2014 12:13:00 +0000 Subject: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified Otherwise we deference a NULL pointer. I saw this while experimenting with libvirt on Xen on ARM, xl already checks that the command line is non NULL and provides "" as a default. Signed-off-by: Ian Campbell Acked-by: Julien Grall Cc: george.dunlap@citrix.com> --- tools/libxl/libxl_arm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 0a1c8c5f9f..0cfd0cf110 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); - if (res) return res; + if (info->u.pv.cmdline) { + res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (res) return res; + } res = fdt_end_node(fdt); if (res) return res; -- 2.30.2